Revert "Avoid occasional confusion of Flymake C/C++ backend"

This reverts commit 67c3a3af1d9e2582193d5ea33b6c190e79ad56e6, which
creates more problems than it solves.

diff --git a/lisp/progmodes/flymake-cc.el b/lisp/progmodes/flymake-cc.el
index 248c95a256f9b4445a05546c9bcd72e78e921ed9..1b449bd07934eee47c754dfdaaf93180174475d0 100644 (file)
--- a/lisp/progmodes/flymake-cc.el
+++ b/lisp/progmodes/flymake-cc.el
@@ -58,9 +58,7 @@ SOURCE."
   (cl-loop
    while
    (search-forward-regexp
-    (concat
-     "^\\(In file included from \\)?<stdin>:\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)"
-     "?:[\n ]?\\(error\\|warning\\|note\\): \\(.*\\)$")
+    "^\\(In file included from \\)?<stdin>:\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?:\n?\\(.*\\): \\(.*\\)$"
     nil t)
    for msg = (match-string 5)
    for (beg . end) = (flymake-diag-region